Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

⚠️ Remove RequeueAfterError #3929

Merged
merged 1 commit into from
Feb 5, 2021
Merged

⚠️ Remove RequeueAfterError #3929

merged 1 commit into from
Feb 5, 2021
+90 −153

Conversation

fabriziopandini
Copy link
Member

What this PR does / why we need it:
RequeueAfterError was deprecated in v0.3 by #3387 and follow up PR removed most of its usages.
This PR completes this work by removing a few left-over usages and finally removes RequeueAfterError

Which issue(s) this PR fixes:
Fixes #3370

@k8s-ci-robot k8s-ci-robot added the cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. label Nov 19, 2020
@k8s-ci-robot k8s-ci-robot added the size/L Denotes a PR that changes 100-499 lines, ignoring generated files. label Nov 19, 2020
@fabriziopandini
Copy link
Member Author

/milestone v0.4.0

@k8s-ci-robot k8s-ci-robot added this to the v0.4.0 milestone Nov 19, 2020
@fabriziopandini
Copy link
Member Author

/retest

vincepri
vincepri reviewed Nov 20, 2020
View reviewed changes
controllers/machine_controller.go Outdated Show resolved Hide resolved
controllers/machine_controller_phases.go Outdated Show resolved Hide resolved
@fabriziopandini
Copy link
Member Author

/retest

detiber
detiber reviewed Dec 1, 2020
View reviewed changes
controllers/machine_controller.go Outdated Show resolved Hide resolved
controllers/machine_controller_phases_test.go Outdated Show resolved Hide resolved
controllers/machine_controller_phases.go
Comment on lines +203 to +195
if externalResult.RequeueAfter > 0 {
return ctrl.Result{RequeueAfter: externalResult.RequeueAfter}, nil
}
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The use of external.ReconcileOutput here makes this quite confusing. Not sure I have any good suggestions on how to make it less confusing without requiring more invasive refactoring, though :(

wfernandes
wfernandes reviewed Dec 14, 2020
View reviewed changes
Copy link
Contributor

@wfernandes wfernandes left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just some minor nits/clarifications.

controllers/machine_controller_phases.go Outdated Show resolved Hide resolved
controlplane/kubeadm/controllers/helpers.go Show resolved Hide resolved
controlplane/kubeadm/controllers/helpers_test.go Outdated Show resolved Hide resolved
@vincepri
Copy link
Member

/retest

@vincepri
Copy link
Member

Let's address/fix the comments above

@vincepri
Copy link
Member

vincepri commented Jan 4, 2021

Hey folks, what's the status of this PR?

@k8s-ci-robot k8s-ci-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Jan 7, 2021
@fabriziopandini fabriziopandini mentioned this pull request Jan 15, 2021
Merged
@vincepri
Copy link
Member

@fabriziopandini Do you have time to rebase this PR?

@k8s-ci-robot k8s-ci-robot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Jan 15, 2021
@fabriziopandini
Copy link
Member Author

@vincepri this one should be ready to go now

vincepri
vincepri requested changes Jan 19, 2021
View reviewed changes
Copy link
Member

@vincepri vincepri left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm ~40% way there, will continue review later

controllers/machine_controller.go Outdated Show resolved Hide resolved
controllers/machine_controller_phases.go Outdated Show resolved Hide resolved
controllers/machine_controller_phases.go Outdated Show resolved Hide resolved
controllers/machine_controller_phases.go Outdated Show resolved Hide resolved
controllers/machine_controller_phases.go Outdated Show resolved Hide resolved
wfernandes
wfernandes reviewed Feb 4, 2021
View reviewed changes
Copy link
Contributor

@wfernandes wfernandes left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

minor comment.

controllers/machine_controller.go Outdated Show resolved Hide resolved
@fabriziopandini
Copy link
Member Author

@vincepri rebased+addressed almost all comments. There is only one point I'm not really happy about...

fabriziopandini
fabriziopandini commented Feb 5, 2021
View reviewed changes
controllers/machine_controller_phases.go
// Infra object went missing after the machine was up and running
return ctrl.Result{}, err
}
if infraReconcileResult.RequeueAfter > 0 {
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is kind of brittle, but TBH also the previous implementation checking the error message wasn't bullet proof...

@k8s-ci-robot
Copy link
Contributor

k8s-ci-robot commented Feb 5, 2021 •
edited
Loading

@fabriziopandini: The following test failed, say /retest to rerun all failed tests:

Test name Commit Details Rerun command
pull-cluster-api-apidiff-main bc5e207 link /test pull-cluster-api-apidiff-main

Full PR test history. Your PR dashboard. Please help us cut down on flakes by linking to an open issue when you hit one in your PR.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository. I understand the commands that are listed here.

vincepri
vincepri approved these changes Feb 5, 2021
View reviewed changes
Copy link
Member

@vincepri vincepri left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

/lgtm
/approve

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Feb 5, 2021
@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: vincepri

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@k8s-ci-robot k8s-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Feb 5, 2021
@k8s-ci-robot k8s-ci-robot merged commit fd37dee into kubernetes-sigs:master Feb 5, 2021
@fabriziopandini fabriziopandini deleted the Remove-RequeueAfterError branch February 10, 2021 13:38
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@wfernandes wfernandes wfernandes left review comments

@detiber detiber detiber left review comments

@vincepri vincepri vincepri approved these changes

@benmoss benmoss Awaiting requested review from benmoss

Assignees

@vincepri vincepri

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. lgtm "Looks good to me", indicates that a PR is ready to be merged. size/L Denotes a PR that changes 100-499 lines, ignoring generated files.
Projects
None yet
Milestone
v0.4
Development

Successfully merging this pull request may close these issues.

Deprecate RequeueAfterError, and remove its usage
5 participants
@fabriziopandini @vincepri @k8s-ci-robot @detiber @wfernandes